projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5213aca d2781af)
bitkeeper revision 1.1236.1.212 (4251a2baCCUHNjZOTPlRnqYfqt0Fag)
authorcwc22@centipede.cl.cam.ac.uk <cwc22@centipede.cl.cam.ac.uk>
Mon, 4 Apr 2005 20:25:30 +0000 (20:25 +0000)
committercwc22@centipede.cl.cam.ac.uk <cwc22@centipede.cl.cam.ac.uk>
Mon, 4 Apr 2005 20:25:30 +0000 (20:25 +0000)
Merge centipede.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
into centipede.cl.cam.ac.uk:/local/scratch/cwc22/Xen-Builds/2005-04-03/xen-unstable.bk

1  2 
.rootkeys patch | diff1 | diff2 | blob | history
linux-2.6.11-xen-sparse/arch/xen/Kconfig patch | diff1 | diff2 | blob | history
xen/arch/x86/mm.c patch | diff1 | diff2 | blob | history

diff --cc .rootkeys
Simple merge
diff --cc xen/arch/x86/mm.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.